Correct Gdk backend import paths and related gtk-doc

Correct the paths in the include guard warnings and use the `@Include`
directive for the Gdk backends.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index d169a3f981937f054d19c9f2a76cd63ce286b64d..d9eae14df8e16b02b4af438dcbc66d4176e3531f 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -939,8 +939,6 @@ gdk_surface_impl_x11_get_type
 </SECTION>
 
 <SECTION>
-<INCLUDE>gdk/gdkwayland.h</INCLUDE>
-<TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
 gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard

diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 88d451a54aeb6afc9a00d25837a9317255c878ef..6b5fcc8626282eb397b4c9921f05f10094dbaaf5 100644 (file)
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -26,7 +26,7 @@
 #define __GDK_BROADWAY_CURSOR_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h
index 4f4931a4edd899493eeb415c32d8ca152855107c..e1e0ffb10d5f4e9cbc5026cffb90258dade7f5aa 100644 (file)
--- a/gdk/broadway/gdkbroadwaydisplay.h
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -19,7 +19,7 @@
 #define __GDK_BROADWAY_DISPLAY_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index 0818af293dced26965e15ee85f6753f4cf264e8b..355869d9dfb9d6a14ee66e1e87bd219ad85f1233 100644 (file)
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -21,7 +21,7 @@
 #define __GDK_BROADWAY_DISPLAY_MANAGER_H__
 
 #if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/broadway/gdkbroadwaymonitor.h b/gdk/broadway/gdkbroadwaymonitor.h
index 4fe9e6a7e5cc7cd023266a3e1d4fedbd05d78e26..36714ff55ae127408450ca0a8bb5746d6f029cd1 100644 (file)
--- a/gdk/broadway/gdkbroadwaymonitor.h
+++ b/gdk/broadway/gdkbroadwaymonitor.h
@@ -23,7 +23,7 @@
 #define __GDK_BROADWAY_MONITOR_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index d6fa967fcc8c7077eed035acd47effc537fc67f1..0938eeb065ef8eda48fca7757fd073d4a160d184 100644 (file)
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_CURSOR_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 9e412eaeee0ecc4b1b287cae9145f1d24f47d926..9b320f60b7bcf70afd37b97f1e0d4ce3b9a51000 100644 (file)
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -19,7 +19,7 @@
 #define __GDK_QUARTZ_DEVICE_CORE_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 018c8582490fed720d6154fba4e6e7259d53ecbc..8ab4966cc1debd77d6ec9f0ab0a4f60e4beb8fb8 100644 (file)
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -19,7 +19,7 @@
 #define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index 4dbd2cbb2649b47ad1cf7b8f65b14fb899f9f925..ce709a6b3f5b2778ee064251765ccffe790acea4 100644 (file)
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_DISPLAY_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 50bd8b15c42b5a00d9a73e279a42a80dd1389b83..38fc822cbba24e51b764a68e482b8395d1c57d36 100644 (file)
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_DISPLAY_MANAGER_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index fb578e1b8fac701c991fe647f801b24163db2fdd..d1a618d134c961a1169f67227d72868ca0079dd6 100644 (file)
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -20,7 +20,7 @@
 #define __GDK_QUARTZ_DND_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index f35612e36ae62ce87a00f95e1a494aacac72bf02..86fe6580bf505cc6d9b2edcfa91acad3a308f5af 100644 (file)
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_KEYS_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzmonitor.h b/gdk/quartz/gdkquartzmonitor.h
index 01dd9ea858299e088afdfebd630373471d62b574..92a619e935010f7010183b2864b68243335f7ab5 100644 (file)
--- a/gdk/quartz/gdkquartzmonitor.h
+++ b/gdk/quartz/gdkquartzmonitor.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_MONITOR_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 87a6e2eeb26d18f51529f4482f969f7307749f8c..245068df25ec8e94bd6b7f3c9115aa5c059c79c7 100644 (file)
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -20,7 +20,7 @@
 #define __GDK_QUARTZ_SCREEN_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS

diff --git a/gdk/quartz/gdkquartzsurface.h b/gdk/quartz/gdkquartzsurface.h
index a37cb37c1d6fada2289e4ef69838177410ae6464..5bfd8d50621332b054e2eb4344557d5a1357fcf5 100644 (file)
--- a/gdk/quartz/gdkquartzsurface.h
+++ b/gdk/quartz/gdkquartzsurface.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_SURFACE_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 3f0559961297ca4a11b95f161ded3fd408720622..12feec3b865887963d143160a840328d1850a923 100644 (file)
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_UTILS_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 9f1fa5b380ceecbd6d11ba1e861306a33100f4c6..56ba3d113478ae56ae6a556fbbad4517f10b12ef 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -61,10 +61,12 @@
  * SECTION:wayland_interaction
  * @Short_description: Wayland backend-specific functions
  * @Title: Wayland Interaction
+ * @Include: gdk/wayland/gdkwayland.h
  *
  * The functions in this section are specific to the GDK Wayland backend.
- * To use them, you need to include the `<gdk/gdkwayland.h>` header and use
- * the Wayland-specific pkg-config `gtk4-wayland` file to build your application.
+ * To use them, you need to include the `<gdk/wayland/gdkwayland.h>` header and
+ * use the Wayland-specific pkg-config `gtk4-wayland` file to build your
+ * application.
  *
  * To make your code compile with other GDK backends, guard backend-specific
  * calls by an ifdef as follows. Since GDK may be built with multiple

diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index a828084b42ef4246f72d52b33c6ba9c3d8c22d63..7bb843e1dbc6718f61d601a6182907f7d2f2d733 100644 (file)
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_DEVICE_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index c6f3b24747ffdc9c2a9580aa714257ba8c220206..99dfe4777557ad0978c8c93bcc99ffeff4ede947 100644 (file)
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_DISPLAY_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index a06586e1588a69a80da30f5ca2a069fd48fa94c8..1e99d01b30feb90a7ae8f43a6ec683f4970ecaa3 100644 (file)
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -23,7 +23,7 @@
 #define __GDK_WAYLAND_GL_CONTEXT_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>

diff --git a/gdk/wayland/gdkwaylandmonitor.h b/gdk/wayland/gdkwaylandmonitor.h
index cbc4bf50c9fe2868e971f944367f1504dc0b124d..8ad95128b578c0ebc3c9d143432b48e812f29823 100644 (file)
--- a/gdk/wayland/gdkwaylandmonitor.h
+++ b/gdk/wayland/gdkwaylandmonitor.h
@@ -23,7 +23,7 @@
 #define __GDK_WAYLAND_MONITOR_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h
index d2360079000d8258aec677b9799dc587b2272ca8..1c4f057a741cec79c6fc9119566f622e6e2503d0 100644 (file)
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_SURFACE_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>